git merge with conflict example